bitkeeper revision 1.1592 (429ae8ff33cT5EmG9lUTaMO920vjKg)

Manual merge.

diff --cc .rootkeys
index 9cb513b2427f415f37e73ea2707d503c7626e696,54ae38da8c4b2b416cf4880e15245bc3a0a3b700..bb993411e2123d64a6f3d150a9ab988250a357be
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -467,45 -366,12 +467,46 @@@
  422e4430-gOD358H8nGGnNWes08Nng netbsd-2.0-xen-sparse/sys/miscfs/kernfs/kernfs_vnops.c
  413cb3b53nyOv1OIeDSsCXhBFDXvJA netbsd-2.0-xen-sparse/sys/nfs/files.nfs
  413aa1d0oNP8HXLvfPuMe6cSroUfSA patches/linux-2.6.11/agpgart.patch
 +427261074Iy1MkbbqIV6zdZDWWx_Jg patches/linux-2.6.11/i386-cpu-hotplug-updated-for-mm.patch
  42372652KCUP-IOH9RN19YQmGhs4aA patches/linux-2.6.11/iomap.patch
  428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.10.patch
 -418abc69J3F638vPO9MYoDGeYilxoQ patches/linux-2.6.11/nettel.patch
 +4296fb998LGSWCcljGKbOCUv3h9uRQ patches/linux-2.6.11/net-csum.patch
+ 429ae875I9ZrqrRDjGD34IC2kzDREw patches/linux-2.6.11/rcu-nohz.patch
 +424f001e_M1Tnxc52rDrmCLelnDWMQ patches/linux-2.6.11/x86_64-linux.patch
  3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
  40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk
 +4209033eUwhDBJ_bxejiv5c6gjXS4A tools/blktap/Makefile
 +4209033ewLAHdhGrT_2jo3Gb_5bDcA tools/blktap/README
 +42277b02mYXxgijE7MFeUe9d8eldMw tools/blktap/README-PARALLAX
 +4209033fHgtGpb_K16_xC9CpkjNZLw tools/blktap/blkdump.c
 +42090340_mvZtozMjghPJO0qsjk4NQ tools/blktap/blkint.h
 +42090340rc2q1wmlGn6HtiJAkqhtNQ tools/blktap/blktaplib.c
 +42090340C-WkRPT7N3t-8Lzehzogdw tools/blktap/blktaplib.h
 +428df8fdkg84W8yveE50EbkbTUZgjQ tools/blktap/block-async.c
 +428df8feTrgGFZEBMA_dYijy9DNs1g tools/blktap/block-async.h
 +42277b02WrfP1meTDPv1M5swFq8oHQ tools/blktap/blockstore.c
 +42277b02P1C0FYj3gqwTZUD8sxKCug tools/blktap/blockstore.h
 +42371b8aL1JsxAXOd4bBhmZKDyjiJg tools/blktap/blockstored.c
 +42371b8aD_x3L9MKsXciMNqkuk58eQ tools/blktap/bstest.c
 +423f270cbEKiTMapKnCyqkuwGvgOMA tools/blktap/parallax-threaded.c
 +423f270cFdXryIcD7HTPUl_Dbk4DAQ tools/blktap/parallax-threaded.h
 +42277b03930x2TJT3PZlw6o0GERXpw tools/blktap/parallax.c
 +42277b03XQYq8bujXSz7JAZ8N7j_pA tools/blktap/radix.c
 +42277b03vZ4-jno_mgKmAcCW3ycRAg tools/blktap/radix.h
 +428df8fe5RYONloDWVMkM-CfHfB1vA tools/blktap/requests-async.c
 +428df8feWeKJ-9HJb5_rFqdm_xqErg tools/blktap/requests-async.h
 +42277b03U_wLHL-alMA0bfxGlqldXg tools/blktap/snaplog.c
 +42277b04Ryya-z662BEx8HnxNN0dGQ tools/blktap/snaplog.h
 +42277b04LxFjptgZ75Z98DUAso4Prg tools/blktap/vdi.c
 +42277b04tt5QkIvs8She8CQqH5kwpg tools/blktap/vdi.h
 +42277b04zMAhB0_946sHQ_H2vwnt0Q tools/blktap/vdi_create.c
 +42277b04xB_iUmiSm6nKcy8OV8bckA tools/blktap/vdi_fill.c
 +42277b045CJGD_rKH-ZT_-0X4knhWA tools/blktap/vdi_list.c
 +42277b043ZKx0NJSbcgptQctQ5rerg tools/blktap/vdi_snap.c
 +423f270c_QDjGLQ_YdaOtyBM5n9BDg tools/blktap/vdi_snap_delete.c
 +42277b043Fjy5-H7LyBtUPyDlZFo6A tools/blktap/vdi_snap_list.c
 +42277b04vhqD6Lq3WmGbaESoAAKdhw tools/blktap/vdi_tree.c
 +42277b047H8fTVyUf75BWAjh6Zpsqg tools/blktap/vdi_validate.c
  4124b307nRyK3dhn1hAsvrY76NuV3g tools/check/Makefile
  4124b307vHLUWbfpemVefmaWDcdfag tools/check/README
  4124b307jt7T3CHysgl9LijNHSe1tA tools/check/check_brctl

diff --cc linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
Simple merge